merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 22 Aug 2012 09:03:03 +0000 (18:03 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 22 Aug 2012 09:03:03 +0000 (18:03 +0900)
commitc1b5aa140164736caf249e24e4041a6a64d7c399
tree1c92be79fcd0145c7904e9c9743609c5ed2132a0
parenta5d97cf54641e36a406b371acc74c74fcf5fcca0
parentb9f2bc48fe0c22e90edbee2e669d7a40686ed048
merge trunk